Merge version 1.22.20+rpi1 and 1.22.21 to produce 1.22.21+rpi1

diff --cc debian/changelog
index a8510ae214708801fbad36c55a9fe98c594af17f,008b40ed07fcab420a9903f99041ca135f5e773c..4d02331e9dc2765d065c1b3a0ec28e22fe01f1b7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,20 +1,31 @@@
- dpkg (1.22.20+rpi1) trixie-staging; urgency=medium
++dpkg (1.22.21+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.20.5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 02 Aug 2020 12:08:02 +0000]
 +  * Hack up Vendor.pm so it doesn't fail
 +    (see https://lists.debian.org/debian-dpkg/2020/08/msg00004.html )
 +
 +  [changes introduce in 1.21.17+rpi1 by Peter Michael Green]
 +  * disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 19 Jun 2025 23:09:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 31 Jul 2025 13:29:08 +0000
++
+ dpkg (1.22.21) unstable; urgency=medium
+ 
+   [ Guillem Jover ]
+   * dpkg-deb: Fix cleanup for control member with restricted directories.
+     Fixes CVE-2025-6297. Reported by zhutyra on HackerOne.
+   * Perl modules:
+     - Dpkg::BuildDriver::DebianRules: Fix uninitialized Perl variables.
+       Closes: #1107971
+     - Dpkg::BuildDriver::DebianRules: Fix R³ dpkg/target/<target> values
+       handling.
+     - Dpkg::BuildTree: Fix needs_root() for R³ with implementation specific
+       keywords. See #1107971.
+   * Code internals:
+     - libdpkg: Do not segfault when adding triggers in no-act mode.
+       Closes: #1108192
+ 
+  -- Guillem Jover <guillem@debian.org>  Tue, 01 Jul 2025 01:32:04 +0200
  
  dpkg (1.22.20) unstable; urgency=medium